Guiffy SureMerge
Guiffy SureMerge is a cross-platform File compare Diff tool, Folder compare, and 3-way auto-merge tool all-in-one. Guiffy SureMerge is available on Windows, Mac OS X, Linux, and Unix operating systems.
Features
- Automatic trustworthy 3-way file merge
- Compare files side-by-side - highlight the differences within the line.
- In-place editing of files
- Compare views can be saved as reports (in HTML).
- Full support for ASCII, MBCS, Unicode character encoding and editing
- Syntax Highlighting for more than 20 source file types
- Ignore of case, white space, comments, regular expressions
- Manual Alignment
- File compare and merge integrated with folder compare
- The Folder Compare interface includes popup menus for file synchronization (Copy, Delete, Rename, etc.) operations.
- With a recursive compare option - folder compare can do a file tree compare.
- Folder compares of archive files (.zip, .tar, .jar and several variants)
- Command line interfaces
- API
- Eclipse and NetBeans plugins
- Shell (desktop) integration on Windows, MacOS X, and Linux (KDE)
- SCM integrations including: ClearCase, CMSynergy, Perforce, and Subversion
See also
External links